vt-d: Clean up hypervisor logging.

Signed-off-by: Weidong Han <weidong.han@intel.com>

diff --git a/xen/arch/x86/hvm/vmx/vtd/dmar.c b/xen/arch/x86/hvm/vmx/vtd/dmar.c
index 49aa994a49d712ef4446b657b3bd401bfbf4451a..786186966f3665b3b16155c46e60f702fdb21670 100644 (file)
--- a/xen/arch/x86/hvm/vmx/vtd/dmar.c
+++ b/xen/arch/x86/hvm/vmx/vtd/dmar.c
@@ -30,7 +30,6 @@
 #include "pci-direct.h"
 #include "pci_regs.h"
 
-#define VTDPREFIX
 int vtd_enabled;
 boolean_param("vtd", vtd_enabled);
 

diff --git a/xen/arch/x86/hvm/vmx/vtd/intel-iommu.c b/xen/arch/x86/hvm/vmx/vtd/intel-iommu.c
index 8a773c559ead4703ba22596e3a31e78b80e03c9c..239239ed8e089e44ac3f06f61dc74dcdb451e97f 100644 (file)
--- a/xen/arch/x86/hvm/vmx/vtd/intel-iommu.c
+++ b/xen/arch/x86/hvm/vmx/vtd/intel-iommu.c
@@ -37,7 +37,6 @@
 
 #define domain_iommu_domid(d) ((d)->arch.hvm_domain.hvm_iommu.iommu_domid)
 
-#define VTDPREFIX
 extern void print_iommu_regs(struct acpi_drhd_unit *drhd);
 extern void print_vtd_entries(struct domain *d, int bus, int devfn,
                               unsigned long gmfn);
@@ -954,7 +953,7 @@ struct iommu *iommu_alloc(void *hw_data)
 
     set_fixmap_nocache(FIX_IOMMU_REGS_BASE_0 + nr_iommus, drhd->address);
     iommu->reg = (void *) fix_to_virt(FIX_IOMMU_REGS_BASE_0 + nr_iommus);
-    dprintk(XENLOG_ERR VTDPREFIX,
+    dprintk(XENLOG_INFO VTDPREFIX,
             "iommu_alloc: iommu->reg = %p drhd->address = %lx\n",
             iommu->reg, drhd->address);
     nr_iommus++;
@@ -1058,7 +1057,7 @@ static int domain_context_mapping_one(
 
     if ( context_present(*context) )
     {
-        gdprintk(XENLOG_INFO VTDPREFIX,
+        gdprintk(XENLOG_WARNING VTDPREFIX,
                  "domain_context_mapping_one:context present:bdf=%x:%x:%x\n",
                  bus, PCI_SLOT(devfn), PCI_FUNC(devfn));
         return 0;
@@ -1097,7 +1096,7 @@ static int domain_context_mapping_one(
     iommu_flush_cache_entry(iommu, context);
 
     gdprintk(XENLOG_INFO VTDPREFIX,
-             "context_mapping_one-%x:%x:%x-*context=%"PRIx64":%"PRIx64
+             "domain_context_mapping_one-%x:%x:%x-*context=%"PRIx64":%"PRIx64
              " hd->pgd=%p\n",
              bus, PCI_SLOT(devfn), PCI_FUNC(devfn),
              context->hi, context->lo, hd->pgd);
@@ -1198,14 +1197,11 @@ static int domain_context_mapping(
             PCI_FUNC(pdev->devfn), PCI_SUBORDINATE_BUS);
 
         if ( sec_bus != sub_bus )
-        {
-            dprintk(XENLOG_INFO VTDPREFIX,
-                    "context_mapping: nested PCI bridge not supported\n");
-            dprintk(XENLOG_INFO VTDPREFIX,
-                    "    bdf = %x:%x:%x sec_bus = %x sub_bus = %x\n",
-                    pdev->bus, PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn),
-                    sec_bus, sub_bus);
-        }
+            gdprintk(XENLOG_WARNING VTDPREFIX,
+                     "context_context_mapping: nested PCI bridge not "
+                     "supported: bdf = %x:%x:%x sec_bus = %x sub_bus = %x\n",
+                     pdev->bus, PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn),
+                     sec_bus, sub_bus);
         break;
     case DEV_TYPE_PCIe_ENDPOINT:
         gdprintk(XENLOG_INFO VTDPREFIX,
@@ -1227,7 +1223,7 @@ static int domain_context_mapping(
             if ( bus2bridge[pdev->bus].bus != 0 )
                 gdprintk(XENLOG_WARNING VTDPREFIX,
                          "domain_context_mapping:bus2bridge"
-                         "[pdev->bus].bus != 0\n");
+                         "[%d].bus != 0\n", pdev->bus);
 
             ret = domain_context_mapping_one(
                 domain, iommu,
@@ -1345,8 +1341,8 @@ static int domain_context_unmap(
         {
             if ( bus2bridge[pdev->bus].bus != 0 )
                 gdprintk(XENLOG_WARNING VTDPREFIX,
-                         "domain_context_mapping:"
-                         "bus2bridge[pdev->bus].bus != 0\n");
+                         "domain_context_unmap:"
+                         "bus2bridge[%d].bus != 0\n", pdev->bus);
 
             ret = domain_context_unmap_one(domain, iommu,
                                            (u8)(bus2bridge[pdev->bus].bus),

diff --git a/xen/arch/x86/hvm/vmx/vtd/io.c b/xen/arch/x86/hvm/vmx/vtd/io.c
index d3500da5dad73f132eb2c1cce6bfde9d8a250e57..39029fab9fdb2ab106b9b330fa8f05f88740e191 100644 (file)
--- a/xen/arch/x86/hvm/vmx/vtd/io.c
+++ b/xen/arch/x86/hvm/vmx/vtd/io.c
@@ -131,7 +131,7 @@ int pt_irq_create_bind_vtd(
         pirq_guest_bind(d->vcpu[0], machine_gsi, BIND_PIRQ__WILL_SHARE);
     }
 
-    gdprintk(XENLOG_INFO,
+    gdprintk(XENLOG_INFO VTDPREFIX,
              "VT-d irq bind: m_irq = %x device = %x intx = %x\n",
              machine_gsi, device, intx);
     return 0;
@@ -187,7 +187,7 @@ static void hvm_dpci_isairq_eoi(struct domain *d, unsigned int isairq)
                 if ( --dpci->mirq[i].pending == 0 )
                 {
                     spin_unlock(&dpci->dirq_lock);
-                    gdprintk(XENLOG_INFO,
+                    gdprintk(XENLOG_INFO VTDPREFIX,
                              "hvm_dpci_isairq_eoi:: mirq = %x\n", i);
                     stop_timer(&dpci->hvm_timer[irq_to_vector(i)]);
                     pirq_guest_eoi(d, i);
@@ -226,7 +226,8 @@ void hvm_dpci_eoi(struct domain *d, unsigned int guest_gsi,
     {
         spin_unlock(&hvm_irq_dpci->dirq_lock);
 
-        gdprintk(XENLOG_INFO, "hvm_dpci_eoi:: mirq = %x\n", machine_gsi);
+        gdprintk(XENLOG_INFO VTDPREFIX,
+                 "hvm_dpci_eoi:: mirq = %x\n", machine_gsi);
         stop_timer(&hvm_irq_dpci->hvm_timer[irq_to_vector(machine_gsi)]);
         if ( (ent == NULL) || !ent->fields.mask )
             pirq_guest_eoi(d, machine_gsi);

diff --git a/xen/arch/x86/hvm/vmx/vtd/utils.c b/xen/arch/x86/hvm/vmx/vtd/utils.c
index b15af311c7d785bb3d59bd71dd224632f993a9fc..55a7149a7e02a9dbe9f4be3619f3f775d2348871 100644 (file)
--- a/xen/arch/x86/hvm/vmx/vtd/utils.c
+++ b/xen/arch/x86/hvm/vmx/vtd/utils.c
@@ -34,7 +34,6 @@
 #include <xen/xmalloc.h>
 #include <xen/inttypes.h>
 
-#define VTDPREFIX "[VT-D]"
 #define INTEL   0x8086
 #define SEABURG 0x4000
 #define C_STEP  2

diff --git a/xen/include/asm-x86/iommu.h b/xen/include/asm-x86/iommu.h
index e2ceffc7de53ebc5f515ea30773e8987670a462e..1894335bab3c6fad00a62bd4ee7fda787a6f5912 100644 (file)
--- a/xen/include/asm-x86/iommu.h
+++ b/xen/include/asm-x86/iommu.h
@@ -79,5 +79,6 @@ int pt_irq_create_bind_vtd(struct domain *d,
                            xen_domctl_bind_pt_irq_t *pt_irq_bind);
 
 #define PT_IRQ_TIME_OUT MILLISECS(8)
+#define VTDPREFIX "[VT-D]"
 
 #endif /* _IOMMU_H_ */